build: Remove linker flags from static libraries
authorEmmanuele Bassi <ebassi@gnome.org>
Tue, 15 Dec 2020 11:36:20 +0000 (11:36 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 15 Dec 2020 11:36:20 +0000 (11:36 +0000)
We only need hardening linker flags on the libgtk shared library;
internal static libraries don't really need them.

gdk/broadway/meson.build
gdk/macos/meson.build
gdk/meson.build
gdk/wayland/cursor/meson.build
gdk/wayland/meson.build
gdk/x11/meson.build
gsk/meson.build
gtk/css/meson.build

index bf3cdc036d2b1f918cbe26893baab37f732b6833..87176f3c69a08e0d2aa97c963671c23025352c71 100644 (file)
@@ -59,7 +59,6 @@ libgdk_broadway = static_library('gdk-broadway',
     '-DGTK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
   ] + common_cflags,
-  link_args: common_ldflags,
   dependencies: [gdk_deps, gdk_broadway_deps])
 
 # gtk4-broadwayd
index e2bba8549b5ab7b6a3b39962393243928adf9866..79a307d2532d7cff2da08eed9c33b1f5192b6924 100644 (file)
@@ -58,6 +58,5 @@ libgdk_macos = static_library('gdk-macos',
                               gdk_macos_sources, gdkconfig, gdkenum_h,
                               include_directories: [ confinc, gdkinc, ],
                               c_args: libgdk_c_args + common_cflags,
-                              link_args: common_ldflags,
                               link_with: [],
                               dependencies: gdk_deps + gdk_macos_deps)
index fb8956c1dfa0922689000d4260c3148fc5e3f825..b131bcc8e63d4dc5fbc0b0a1fcf662f0f697741f 100644 (file)
@@ -251,7 +251,7 @@ libgdk = static_library('gdk',
   include_directories: [confinc, gdkx11_inc, wlinc],
   c_args: libgdk_c_args + common_cflags,
   link_whole: gdk_backends,
-  link_args: common_ldflags)
+)
 
 # We don't have link_with: to internal static libs here on purpose, just
 # list the dependencies and generated headers and such, for use in the
index 4b48085d12a0318c76e51a4dd004e6fa9815f7eb..0043d7c8580d99b1e35187cb196dcad911c04f3a 100644 (file)
@@ -8,5 +8,4 @@ libwayland_cursor = static_library('wayland+cursor',
                                    sources: wayland_cursor_sources,
                                    include_directories: [ confinc, ],
                                    dependencies: [ glib_dep, wlclientdep, ],
-                                   c_args: common_cflags,
-                                   link_args: common_ldflags)
+                                   c_args: common_cflags)
index 4d5f3ea5ccf13388ae7c5ea71ae69f485c60d900..6cc75c8754960ee0c8c0a32bb1a21b4a6321a59f 100644 (file)
@@ -102,6 +102,5 @@ libgdk_wayland = static_library('gdk-wayland',
                                   '-DGTK_COMPILATION',
                                   '-DG_LOG_DOMAIN="Gdk"',
                                 ] + common_cflags,
-                                link_args: common_ldflags,
                                 link_with: [libwayland_cursor, ],
                                 dependencies: [ gdk_deps, gdk_wayland_deps])
index f846450c3bfa0910c06ca63fa23249198f5f75b2..46eec9da454eaf75c79ef60241f3a335295c679a 100644 (file)
@@ -79,5 +79,4 @@ libgdk_x11 = static_library('gdk-x11', gdkmarshal_h,
                               '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gdk"',
                             ] + common_cflags,
-                            link_args: common_ldflags,
                             dependencies: [ gdk_deps, gdk_x11_deps, ])
index ffec4d2ce41c202887cc535df3e2dfbcf008e303..8c8e79d9b9748f7a0e1def21b4a3dc441e696784 100644 (file)
@@ -175,8 +175,7 @@ libgsk = static_library('gsk',
                           '-DG_LOG_DOMAIN="Gsk"',
                           '-DG_LOG_STRUCTURED=1',
                         ] + common_cflags,
-                        link_with: libgdk,
-                        link_args: common_ldflags)
+                        link_with: libgdk)
 
 # We don't have link_with: to internal static libs here on purpose, just
 # list the dependencies and generated headers and such, for use in the
index 501411f917183e59f4b04433e72c961295359ff9..0b5ddd948e868b1817a6333bd7b6d376be36eaac 100644 (file)
@@ -47,8 +47,7 @@ libgtk_css = static_library('gtk_css',
                             c_args: [
                               '-DGTK_COMPILATION',
                               '-DG_LOG_DOMAIN="Gtk"',
-                            ] + common_cflags,
-                            link_args: common_ldflags)
+                            ] + common_cflags)
 
 # We don't have link_with: to internal static libs here on purpose, just
 # list the dependencies and generated headers and such, for use in the